headerbar: Duct-tape over the measure mess

Fixes various reftests.

The headerbar needs soeone to redo sizing.

diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index d3f35da2b017e2aee57da233be0edd81df157856..42a23008108ada43bbef2cbd411e66314e1247fb 100644 (file)
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -879,12 +879,18 @@ gtk_header_bar_measure (GtkWidget      *widget,
                         int            *minimum_baseline,
                         int            *natural_baseline)
 {
+  int min, nat;
+  gtk_header_bar_get_size (widget, orientation, &min, &nat);
+
   if (for_size < 0)
-    gtk_header_bar_get_size (widget, orientation, minimum, natural);
+    *natural = nat;
   else if (orientation == GTK_ORIENTATION_HORIZONTAL)
     gtk_header_bar_compute_size_for_orientation (widget, for_size, minimum, natural);
   else
     gtk_header_bar_compute_size_for_opposing_orientation (widget, for_size, minimum, natural);
+
+  *minimum = MAX (*minimum, min);
+  *natural = MAX (*natural, min);
 }
 
 static void